merge with xen-ia64-unstable.hg
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Wed, 22 Mar 2006 18:18:42 +0000 (19:18 +0100)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Wed, 22 Mar 2006 18:18:42 +0000 (19:18 +0100)

Trivial merge